PHP 8.1: Added support for enum keyword
#3478
Conversation
kukulich
force-pushed
the
php81-enum-keyword
branch
from
7f1bd6b
to
8be91bc
Compare
kukulich
changed the title
enum keyword
kukulich
force-pushed
the
php81-enum-keyword
branch
2 times, most recently
from
a86c6de
to
d709d56
Compare
|
Thanks for the update @kukulich, left one more comment. Other that that, 👍🏻 |
kukulich
force-pushed
the
php81-enum-keyword
branch
from
d709d56
to
94e80e7
Compare
kukulich
force-pushed
the
php81-enum-keyword
branch
2 times, most recently
from
42551e5
to
eb27ac3
Compare
tests/Core/Tokenizer/EnumTest.php
Outdated
| * | ||
| * @return void | ||
| */ | ||
| public function testEnums($testMarker, $expectedScopeOpenerLine, $expectedScopeCloserLine) |
There was a problem hiding this comment.
Just wondering - why test the line and not the actual token position (in relation to the keyword token) ?
I realize the latter is more fiddly for setting up the tests, but it's also much more precise.
In other tests, this has been done by the data provider providing an offset and the token position then being calculated by $expectedOpener = $enum + $openerOffset;.
There was a problem hiding this comment.
Looks like you modified it for scope opener, but removed the check for scope closer ?
kukulich
force-pushed
the
php81-enum-keyword
branch
3 times, most recently
from
3e94231
to
bca788c
Compare
kukulich
force-pushed
the
php81-enum-keyword
branch
3 times, most recently
from
a7a0128
to
106eba3
Compare
|
What is the current state of this one? |
kukulich
force-pushed
the
php81-enum-keyword
branch
from
106eba3
to
f236c6a
Compare
|
Rebased on master. |
| $tokens = self::$phpcsFile->getTokens(); | ||
|
|
||
| $target = $this->getTargetToken($testMarker, [T_ENUM, T_STRING], $testContent); | ||
| $this->assertSame(T_STRING, $tokens[$target]['code']); |
There was a problem hiding this comment.
Due to the way namespaces are tokenized in 4.0 (they become T_NAME_RELATIVE or T_NAME_QUALIFIED) I had to reverse this logic in the 4.0 branch to use assertNotSame(T_ENUM...). I didn't make the same change in master.
|
Thanks a lot for this PR. I really appreciate the effort you're putting in to add support for 8.1 features to PHPCS. |
Fixes #3474